From f09e6f80624aeaac7e5070358ccf6580391c1cb2 Mon Sep 17 00:00:00 2001 From: "kfraser@localhost.localdomain" Date: Wed, 20 Jun 2007 19:31:37 +0100 Subject: [PATCH] Rename ddc_info -> vbeddc_info in interface header. Signed-off-by: Keir Fraser --- xen/arch/x86/platform_hypercall.c | 10 +++++----- xen/include/public/platform.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/platform_hypercall.c b/xen/arch/x86/platform_hypercall.c index 33dd905d07..2e087c4103 100644 --- a/xen/arch/x86/platform_hypercall.c +++ b/xen/arch/x86/platform_hypercall.c @@ -227,17 +227,17 @@ ret_t do_platform_op(XEN_GUEST_HANDLE(xen_platform_op_t) u_xenpf_op) if ( *(u32 *)bootsym(boot_edid_info) == 0x13131313 ) break; - op->u.firmware_info.u.ddc_info.capabilities = + op->u.firmware_info.u.vbeddc_info.capabilities = bootsym(boot_edid_caps); - op->u.firmware_info.u.ddc_info.edid_transfer_time = + op->u.firmware_info.u.vbeddc_info.edid_transfer_time = bootsym(boot_edid_caps) >> 8; ret = 0; if ( copy_field_to_guest(u_xenpf_op, op, u.firmware_info. - u.ddc_info.capabilities) || + u.vbeddc_info.capabilities) || copy_field_to_guest(u_xenpf_op, op, u.firmware_info. - u.ddc_info.edid_transfer_time) || - copy_to_compat(op->u.firmware_info.u.ddc_info.edid, + u.vbeddc_info.edid_transfer_time) || + copy_to_compat(op->u.firmware_info.u.vbeddc_info.edid, bootsym(boot_edid_info), 128) ) ret = -EFAULT; break; diff --git a/xen/include/public/platform.h b/xen/include/public/platform.h index 2b2a595c77..3347666dbf 100644 --- a/xen/include/public/platform.h +++ b/xen/include/public/platform.h @@ -147,7 +147,7 @@ struct xenpf_firmware_info { uint8_t edid_transfer_time; /* must refer to 128-byte buffer */ XEN_GUEST_HANDLE(uint8_t) edid; - } ddc_info; /* XEN_FW_VBEDDC_INFO */ + } vbeddc_info; /* XEN_FW_VBEDDC_INFO */ } u; }; typedef struct xenpf_firmware_info xenpf_firmware_info_t; -- 2.30.2